zynqmp: pm: Reimplement clock set parent EEMI API

Clock set parent EEMI API is reimplemented to use system-level clock
and pll EEMI APIs rather than direct MMIO read/write accesses to clock
and pll control registers.
Since linux still uses clock set parent API to set pre_src, post_src, div2
and bypass, in the implementation of pm_clock_set_parent() we need to
workaround this by distinguishing two cases:
1) if the given clock ID corresponds to a PLL-related clock ID (*_PRE_SRC,
*_POST_SRC, *_INT_MUX or *PLL clock IDs); or 2) given clock ID is truly
an on-chip clock.
For case 1) we'll map the call onto PLL set parameter EEMI API with the
respective parameter ID. Since clock set parent interface to EL1/2 receives
parent index (mux select value), the value is just passed to PMU.
Functions that appear to be unused after this change is made are removed.

Setting the parent of *PLL clocks, that actually model bypass, is not
possible. This is already ensured by the existing clock model having the
CLK_SET_RATE_NO_REPARENT flag. The API also doesn't allow changing the
bypass parent. Bypass is controlled only by the PMU firmware.

Signed-off-by: Mirela Simonovic <[email protected]>
Acked-by: Will Wong <[email protected]>
Signed-off-by: Jolly Shah <[email protected]>

diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c
index 2e07779d3d2bd09638795a611e3ba2159a304252..ca2f452b2228bd192d1f5d4ee52e11119f9abeb2 100644 (file)
--- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c
@@ -2493,11 +2493,19 @@ enum pm_ret_status pm_api_clock_get_attributes(unsigned int clock_id,
  * implemented by linux to system-level EEMI APIs
  * @nid:       PLL node ID
  * @cid:       PLL clock ID
+ * @pre_src:   Pre-source PLL clock ID
+ * @post_src:  Post-source PLL clock ID
+ * @div2:      DIV2 PLL clock ID
+ * @bypass:    PLL output clock ID that maps to bypass select output
  * @mode:      PLL mode currently set via IOCTL (PLL_FRAC_MODE/PLL_INT_MODE)
  */
 struct pm_pll {
        const enum pm_node_id nid;
        const enum clock_id cid;
+       const enum clock_id pre_src;
+       const enum clock_id post_src;
+       const enum clock_id div2;
+       const enum clock_id bypass;
        uint8_t mode;
 };
 
@@ -2505,18 +2513,38 @@ static struct pm_pll pm_plls[] = {
        {
                .nid = NODE_IOPLL,
                .cid = CLK_IOPLL_INT,
+               .pre_src = CLK_IOPLL_PRE_SRC,
+               .post_src = CLK_IOPLL_POST_SRC,
+               .div2 = CLK_IOPLL_INT_MUX,
+               .bypass = CLK_IOPLL,
        }, {
                .nid = NODE_RPLL,
                .cid = CLK_RPLL_INT,
+               .pre_src = CLK_RPLL_PRE_SRC,
+               .post_src = CLK_RPLL_POST_SRC,
+               .div2 = CLK_RPLL_INT_MUX,
+               .bypass = CLK_RPLL,
        }, {
                .nid = NODE_APLL,
                .cid = CLK_APLL_INT,
+               .pre_src = CLK_APLL_PRE_SRC,
+               .post_src = CLK_APLL_POST_SRC,
+               .div2 = CLK_APLL_INT_MUX,
+               .bypass = CLK_APLL,
        }, {
                .nid = NODE_VPLL,
                .cid = CLK_VPLL_INT,
+               .pre_src = CLK_VPLL_PRE_SRC,
+               .post_src = CLK_VPLL_POST_SRC,
+               .div2 = CLK_VPLL_INT_MUX,
+               .bypass = CLK_VPLL,
        }, {
                .nid = NODE_DPLL,
                .cid = CLK_DPLL_INT,
+               .pre_src = CLK_DPLL_PRE_SRC,
+               .post_src = CLK_DPLL_POST_SRC,
+               .div2 = CLK_DPLL_INT_MUX,
+               .bypass = CLK_DPLL,
        },
 };
 
@@ -2558,6 +2586,28 @@ enum pm_ret_status pm_clock_get_pll_node_id(enum clock_id clock_id,
        return PM_RET_ERROR_ARGS;
 }
 
+/**
+ * pm_clock_get_pll_by_related_clk() - Get PLL structure by PLL-related clock ID
+ * @clock_id   Clock ID
+ *
+ * @return     Pointer to PLL structure if found, NULL otherwise
+ */
+struct pm_pll *pm_clock_get_pll_by_related_clk(enum clock_id clock_id)
+{
+       uint32_t i;
+
+       for (i = 0; i < ARRAY_SIZE(pm_plls); i++) {
+               if (pm_plls[i].pre_src == clock_id ||
+                   pm_plls[i].post_src == clock_id ||
+                   pm_plls[i].div2 == clock_id ||
+                   pm_plls[i].bypass == clock_id) {
+                       return &pm_plls[i];
+               }
+       }
+
+       return NULL;
+}
+
 /**
  * pm_clock_pll_enable() - "Enable" the PLL clock (lock the PLL)
  * @pll: PLL to be locked
@@ -2629,54 +2679,34 @@ enum pm_ret_status pm_clock_pll_get_state(struct pm_pll *pll,
 }
 
 /**
- * pm_api_clock_setparent - Set the clock parent for given id
- * @clock_id   Id of the clock
- * @parent_idx parent index
+ * pm_clock_pll_set_parent - Set the clock parent for PLL-related clock id
+ * @pll                        Target PLL structure
+ * @clock_id           Id of the clock
+ * @parent_index       parent index (=mux select value)
  *
- * This function is used by master to set parent for any clock.
+ * The whole clock-tree implementation relies on the fact that parent indexes
+ * match to the multiplexer select values. This function has to rely on that
+ * assumption as well => parent_index is actually the mux select value.
  *
  * Return: Returns status, either success or error+reason.
  */
-enum pm_ret_status pm_api_clock_setparent(unsigned int clock_id,
-                                         unsigned int parent_idx)
+enum pm_ret_status pm_clock_pll_set_parent(struct pm_pll *pll,
+                                          enum clock_id clock_id,
+                                          unsigned int parent_index)
 {
-       enum pm_ret_status ret = PM_RET_SUCCESS;
-       struct pm_clock_node *nodes;
-       uint8_t num_nodes;
-       unsigned int reg, val;
-       int32_t *clk_parents;
-       unsigned int i = 0;
-       uint8_t  offset = NA_SHIFT, width = NA_WIDTH;
-
-       if (!pm_clock_valid(clock_id))
+       if (!pll)
                return PM_RET_ERROR_ARGS;
+       if (pll->pre_src == clock_id)
+               return pm_pll_set_parameter(pll->nid, PM_PLL_PARAM_PRE_SRC,
+                                           parent_index);
+       if (pll->post_src == clock_id)
+               return pm_pll_set_parameter(pll->nid, PM_PLL_PARAM_POST_SRC,
+                                           parent_index);
+       if (pll->div2 == clock_id)
+               return pm_pll_set_parameter(pll->nid, PM_PLL_PARAM_DIV2,
+                                           parent_index);
 
-       if (pm_clock_type(clock_id) != CLK_TYPE_OUTPUT)
-               return PM_RET_ERROR_NOTSUPPORTED;
-
-       clk_parents = *clocks[clock_id].parents;
-
-       for (i = 0; i <= parent_idx; i++)
-               if (clk_parents[i] == CLK_NA_PARENT)
-                       return PM_RET_ERROR_ARGS;
-
-       nodes = *clocks[clock_id].nodes;
-       num_nodes = clocks[clock_id].num_nodes;
-       for (i = 0; i < num_nodes; i++) {
-               if (nodes->type == TYPE_MUX) {
-                       offset = nodes->offset;
-                       width = nodes->width;
-               }
-               nodes++;
-       }
-       if (width == NA_WIDTH)
-               return PM_RET_ERROR_NOTSUPPORTED;
-
-       reg = clocks[clock_id].control_reg;
-       val = parent_idx << offset;
-       ret = pm_mmio_write(reg, BIT_MASK(offset, width), val);
-
-       return ret;
+       return PM_RET_ERROR_ARGS;
 }
 
 /**

diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
index c599f59fe1cae3a385fbefb096ef2a44e887b8ba..c406bbdfc0b58c1e0cfd0ffd9e2e815c6bb8d723 100644 (file)
--- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
@@ -276,6 +276,7 @@ enum {
 
 struct pm_pll;
 struct pm_pll *pm_clock_get_pll(enum clock_id clock_id);
+struct pm_pll *pm_clock_get_pll_by_related_clk(enum clock_id clock_id);
 uint8_t pm_clock_has_div(unsigned int clock_id, enum pm_clock_div_id div_id);
 
 enum pm_ret_status pm_api_clock_get_name(unsigned int clock_id, char *name);
@@ -300,8 +301,9 @@ enum pm_ret_status pm_clock_pll_enable(struct pm_pll *pll);
 enum pm_ret_status pm_clock_pll_disable(struct pm_pll *pll);
 enum pm_ret_status pm_clock_pll_get_state(struct pm_pll *pll,
                                          unsigned int *state);
-enum pm_ret_status pm_api_clock_setparent(unsigned int clock_id,
-                                         unsigned int parent_idx);
+enum pm_ret_status pm_clock_pll_set_parent(struct pm_pll *pll,
+                                          enum clock_id clock_id,
+                                          unsigned int parent_index);
 enum pm_ret_status pm_api_clock_getparent(unsigned int clock_id,
                                          unsigned int *parent_idx);
 enum pm_ret_status pm_clock_set_pll_mode(enum clock_id clock_id,

diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c
index eb54bcb71b8aede94efea11e10a593fbca5aa654..3c10bdb9fe858835400411965a4bb92ad1dfca1c 100644 (file)
--- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c
@@ -1082,16 +1082,32 @@ enum pm_ret_status pm_clock_getrate(unsigned int clock_id,
 /**
  * pm_clock_setparent - Set the clock parent for given id
  * @clock_id: Id of the clock
- * @parent_id: parent id
+ * @parent_index: Index of the parent clock into clock's parents array
  *
  * This function is used by master to set parent for any clock.
  *
  * Return: Returns status, either success or error+reason.
  */
 enum pm_ret_status pm_clock_setparent(unsigned int clock_id,
-                                     unsigned int parent_id)
+                                     unsigned int parent_index)
 {
-       return pm_api_clock_setparent(clock_id, parent_id);
+       struct pm_pll *pll;
+       uint32_t payload[PAYLOAD_ARG_CNT];
+       enum pm_ret_status status;
+
+       /* First try to handle it as a PLL */
+       pll = pm_clock_get_pll_by_related_clk(clock_id);
+       if (pll)
+               return pm_clock_pll_set_parent(pll, clock_id, parent_index);
+
+       /* Check if clock ID is a valid on-chip clock */
+       status = pm_clock_id_is_valid(clock_id);
+       if (status != PM_RET_SUCCESS)
+               return status;
+
+       /* Send request to the PMU */
+       PM_PACK_PAYLOAD3(payload, PM_CLOCK_SETPARENT, clock_id, parent_index);
+       return pm_ipi_send_sync(primary_proc, payload, NULL, 0);
 }
 
 /**